Removing some obsolete logic