some cleanup of standard files; added model methods to expire and unexpire account