Removing self dependencies