Remove unrequited features and cruft