removed some hard coded lists