Clean up

Removed all "autopattr" objects and cleaned up a bit