removed irrelevant code