Remove old stuff
Fix Intent class settings & functions
Fix typos.