Attempting to remove unnecessary code #2