Removing lots of cruft to reduce repo size