Removed testing hacks