Cleanup

updates cleanup and add correct responses