Tidying up loco, removing component stuff