Renaming slots to follow naming conventions,  Deleting some redundant slots, deleting some unused code