removed some irrelevant stuff