Removed debug and commented code