Removed debug and comments