Cleanup code from old branch