Took out some things that were added from merge