Removal of old cruft and refactor of attr reader/accessors