Cleanup

general updates