making it more readable
removing unimplemented feature

rethinking the feature toggle expiration contract