Code cleaning up and removing unimplmented options