Code cleanup

Removed unused constructors and debug text no longer needed.