Unused procedures and functions removed