Remove old code, will be reintroduced in small steps