cleaning irrelevant code