Can now rename while splitting
Removed unused code