Cleanup and simplify models