cleanup, needs more love but I'm so tired