Simple cleanup

Moved some of the attribute management to the necessary object files.