Removed testing hack