Removing push/pull logic