General clean up 2