Remove old

rebase stuff from @webzwo0i