Removing unneeded intermediary