Clean up all remaining specs and corresponding code