Removed debug text + unnecessary code