Removed some irrelevant code