Issue #7: Remove wrappers and unwanted imports

Removed the one-line wrappers.
Remove unwanted import

Also removes a debugging-print that I left in