cieanup attempt, still unfinished