Cleanup

- Remove old code