Revert adding preview
More clean up