Storage interface cleanup