[clean] Removing dead code