cleanup issue with start of new feature and production release