Eliminate reference to specific system