Some more patching
Removing old / obsolete function definition