Cleanup unnecessarily codes