remove unused pods + big fixes