Removing static dependencies