relvar cleaned up