Removed commented debug-code