Removed debug messages and superfluous comments