Remove lots of code