removed debug and commented code