Cleanup some development and testing code