Removed several unneeded folders
Updated to work with 4.2