Removed debug statments and TODO comments