Remove broken function system and remove container variable types