Cleanup not used code
Repair - refactor