Removed excessive code and comments from debugging and large changes