Removing temporary testing hacks