Clean up manual models