finished cleanup process from previous commit