general cleanup of first two sections