Removed non-essential code