Cleaned irrelevant code