Removed unnecessary commented code & cleanup