Cleanup for development