bug clean up early stages