Bhaskar cleanups

@maddalab take 2. @Primer42