Reverted some chnages that are no longer needed