removed a whole lot of useless stuff