Removed debug and extra code