Removed debug shortcuts