Remove unneeded patches and  fix errors

Done this to help clean up the errors. Isnt tested (I know it wont work) but hope this helps alittle.