Re-adding some commits for general clean up