removing irrelevant code