Additional cleanup
Removing cruft