Cleanup for following changes