fix label
remove leftover merge crap
remove fix-me's