Cleaning up composer