removed non-relevant stuff