[PATCH 3/5] Remove un-needed code from misc