general cleanup - main and more function progress