Further cleaning up