Removing depenency from examples