Removing dead code; Cleaning up code