Getting rid of unneeded func