Cleanup and backspace issue