removed some ugly things