further cleanups as per 25 Aug feature