more cleanup, needs moar tho