Removing troublesome (and unnecessary) include