Remove debugging
Rename