Removed Forced Debug message

- Found the error
- Minor code cleanup