Revert "added additional cleanup"

This reverts commit ccb2b6635791eb5fdc66147da46d0e06b7817b59.