ME: refactored 'expired' function and moved it outside the class
ME: refactored 'expired' function and moved it outside the class

sounay/flaminggo-test,smn/onadata,qlands/onadata,sounay/flaminggo-test,hnjamba/onaclone,spatialdev/onadata,smn/onadata,piqoni/onadata,piqoni/onadata,hnjamba/onaclone,piqoni/onadata,spatialdev/onadata,spatialdev/onadata,GeoODK/onadata,hnjamba/onaclone,spatialdev/onadata,GeoODK/onadata,GeoODK/onadata,sounay/flaminggo-test,qlands/onadata,GeoODK/onadata,hnjamba/onaclone,qlands/onadata,sounay/flaminggo-test,smn/onadata,qlands/onadata,smn/onadata,piqoni/onadata