Some fixes to make code look clearer. Removed unnecessary files and features