remove leftover stuff and fixes