removed a bit of unnecessary stuff