Removed Debugging

Minor fixes and debugging removed