Code cleaning (removing dead code)