removed a few useless stuff