removing slots and fixing return fields