Further cleaning up changes