Clean up the options call when moving to the main activity

That should fix the FIXMEs