removed some items that I wasn't going to work on