After testing cleanup