Remove irellevant code