Cleanup and re-enabled disabled code.