Removed built-in functions david/kyle