cleanup and enabled respectify