Removing commented things that won't be used