MANATEE-188: Removing old code.