removed a lot of unwanted stuff