Remove unused and cleanup.