Fix for STORM-244 (cleanup)