Removed debug boilerplate