Some quick clean up to remove unncessary changes