- models and elements now properly clean up after themselves