Move more functions to *.remove.inc file