Clean up cruft, ensure passing specs