Strip unused code

WIP