cleanup and stub out .s and ..