Remove useless config target; some cleanup.