remove code that has been moved to salt proper