Remove # cleanup