Cleanup unused code, issue 7