Got rid of old cruft and compacted supporting libs