Cleanup of unused legacy code