Removed debug hack