Removed debug features