Removing pinches and cacti dependency