removed things that shoul've been removed