+ Removed unnecessary files
+ Added suppresswarnings annonation to deprecated method