Cleanup some custom code for testing