clean up, and stub out rspecs