simplifying by removing unneeded patch code..